From e83db33a95b0c032b44fbc4e61936981a0ac1c41 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 20 Apr 2011 17:13:07 +0100 Subject: [PATCH] tools: libxl: do not specify protocol node for disk or net This node is written by the front/backends as part of their negotiation about how to speak to each other. The toolstack has no part in this and it certainly shouldn't be hardcoding the 32 bit protocol! Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/libxl/libxl.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 96041e73ba..0146a966e2 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1060,11 +1060,6 @@ int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *dis flexarray_append(front, "device-type"); flexarray_append(front, disk->is_cdrom ? "cdrom" : "disk"); - if (0 /* protocol != native*/) { - flexarray_append(front, "protocol"); - flexarray_append(front, "x86_32-abi"); /* hardcoded ! */ - } - libxl__device_generic_add(&gc, &device, libxl__xs_kvs_of_flexarray(&gc, back, back->count), libxl__xs_kvs_of_flexarray(&gc, front, front->count)); @@ -1304,11 +1299,6 @@ int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic) flexarray_append(front, libxl__sprintf(&gc, "%02x:%02x:%02x:%02x:%02x:%02x", nic->mac[0], nic->mac[1], nic->mac[2], nic->mac[3], nic->mac[4], nic->mac[5])); - if (0 /* protocol != native*/) { - flexarray_append(front, "protocol"); - flexarray_append(front, "x86_32-abi"); /* hardcoded ! */ - } - libxl__device_generic_add(&gc, &device, libxl__xs_kvs_of_flexarray(&gc, back, back->count), libxl__xs_kvs_of_flexarray(&gc, front, front->count)); -- 2.30.2